Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 22:16:20 +0000 (15:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 22:16:20 +0000 (15:16 -0700)
commit809fc7b93d07043239da1616346ab3c8dba4e0c0
treeb844fe49f330581c9f08e89f112f01a32022d753
parent20f8ab0156a53e688f494a932e295634611efa64
parent945bca4fa20dde71e65941901f28250795305e24
Merge from trunk.